Merge remote-tracking branch 'origin/master'
[nmbug-tags.git] / tags / 0a1bd306cb2e306ff49d72b6d2466c1d4a0ade2b.1451502495.git.wking@tremily.us / patch