Merge dev to master #79

Closed nikhil-zinjurde-imgtec closed 8 years ago