A couple more moving to 1.6
Merge pull request #28 from tomw2/morebuild16

A couple more moving to 1.6