wtsi-npg/simtools — pull request #16 by keithj (2014-09-30 09:12:07+00:00)
Title: Sync devel with master

These commits were merged with master by mistake; they should have been merged with devel.