Playing it safe
Merge branch 'master' into applications
Merge pull request #337 from andrewhayward/applications

Applications