Fixed merge conflicts that made there way into develop on Moons commit.
Merge branch 'dawson' into develop