Commit b331385e8ae1395fa82b54f1f1750d1d868d111f

DRC 2016-07-11T13:11:25

Merge branch 'master' into dev