Merge branch 'release-0.9' into develop
Authored by: Isaac Assegai 2016-07-17
Parents: [813899][983dcf]