Merge dev to master #105

Closed nikhil-zinjurde-imgtec closed 8 years ago