Commit 1a8c68ac5b744584e3134cba52084bb0f1900df6

DRC 2016-10-07T12:55:18

Merge branch 'master' into dev