Merge branches to pull final changes for hbook 2017q2 into the proper branch. #36

Closed Mrt134 closed 7 years ago