Merge branch 'release-0.8'
Signed-off-by: Isaac Assegai <Isaac.A.Travers@...>
Authored by: Isaac Assegai 2016-07-13
Parents: [0413bb][c1520c]
Child: [708c29]