Merge remote branch 'bgianfo/master'
This was already merged (by cherry-pick) but aparently github doesn't detect that, so this will hopefully properly show that these patches have been pulled in.
This commit is contained in:
commit
6b64ef81d8