Merge pull request #2803 from rorysexton/dev_branch