bbondy merged 1 commit into master from tests/no-pre-push Oct 26, 2017