Add 1.7 changes in master.

#19