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

A couple more moving to 1.6
Add mailmap to improve "git shortlog -nse"
No more warnings, completely clean build [1055]
Merge pull request #29 from tommyjasmin/master

No more warnings, completely clean build [1055]