Commit 8a9b042b261bbf0ac779f770701def31489c155c

DRC 2016-12-10T09:35:30

Merge branch 'master' into dev