Merge remote-tracking branch 'origin/dev' into dev
Authored by: James Williams 2014-06-26
Parent(s): [46187c][9b377d]
Child(ren): [cab3e5][cf1d1a][d8597d]