Merge branch 'master' into release
Authored by: Ian Bell 2016-05-12
Parents: [064662][461a5d]
Child: [e8c90e]