Merge branch 'mlutfy-dev-issue-645-1' into development. Fixes #645
authorDarren <darren@darrenwhitlen.com>
Tue, 20 Jan 2015 12:43:01 +0000 (12:43 +0000)
committerDarren <darren@darrenwhitlen.com>
Tue, 20 Jan 2015 12:43:01 +0000 (12:43 +0000)

Trivial merge