Merge branch 'CoryChaplin-fix_380' into development
authorDarren <darren@darrenwhitlen.com>
Thu, 17 Jul 2014 21:13:53 +0000 (22:13 +0100)
committerDarren <darren@darrenwhitlen.com>
Thu, 17 Jul 2014 21:13:53 +0000 (22:13 +0100)

Trivial merge