Commit 70b06cc6e71e15f0d7550f67b113eed5e6f30a5f

Behdad Esfahbod 2018-02-10T16:13:06

More fixes