Commit 9fdb8f855367def184c354ac18fb926dcef3bc21

DRC 2016-11-22T09:33:19

Merge branch 'master' into dev