Closed bug-or-feature closed 2 weeks ago
Part one of #1437 - pulling in commits from master that should have been on develop
Part one of #1437 - pulling in commits from master that should have been on develop