Commit 6c36568626b0b756f9ef77b379db471f8c06b21b

DRC 2016-09-20T18:09:15

Merge branch 'master' into dev