Commit fe8f40a4180e7b02831a264c0b3c66763156abb6

Behdad Esfahbod 2018-02-18T10:45:33

Merge branch 'master' into bitops