Commit 2cc4f93c88d1c150c4b9a72e95f77e52fda27e24

DRC 2018-11-12T14:40:19

Merge branch 'master' into dev