Merge branch 'release-0.7'
Authored by: Isaac Assegai 2016-07-09
Parents: [45b8bd][b033a5]
Child: [31f0d7]