Commit c0f3512d5a5d6454c8f72c49a93f9e26b301ccdd

DRC 2017-08-31T20:57:19

Merge branch 'master' into dev