Merge dev to master #61

Closed nikhil-zinjurde-imgtec closed 8 years ago