Update for 1.6

Author His Dad <John@hisdad.org>
Author date 2015-03-05 18:51:58
Author local date 2015-03-06 07:51:58 +1300
Committer His Dad <John@hisdad.org>
Committer date 2015-03-05 18:51:58
Committer local date 2015-03-06 07:51:58 +1300
Commit 3fe0accbfb4ee301896484348b8f2b3b5bbb18eb
Tree b635c61547c0be88761c49dc4a74f7d3f59b6460
Parent 7a1f2dab1ba2175b34a5d792f65b5a7f0677be31
Update for 1.6