Commit d34d255957051d0f5a7ce836b87cd4d4a47ad94e

DRC 2017-01-19T19:05:21

Merge branch 'master' into dev