Merge pull request #1 from rednose-public/1.5

1.5
Merge pull request #2 from rednose-public/1.5

1.5
Merge branch 'master' into 1.6