Commit 7c2bfdb0402a89afbdc5249ebd88b32e8899e44d

DRC 2018-02-26T18:43:40

Merge branch 'master' into dev Closes #214