Merge pull request #154 from OpenGamma/topic/PLAT-6701

topic/PLAT-6701
Merge remote branch 'refs/remotes/origin/develop' into topic/PLAT-6702