Commit afdd7999e4a5c072b7df8a235f97f087e8afb6aa

DRC 2017-12-06T12:20:24

Merge branch 'master' into dev + acknowledge 1.5.3 release