Merge tag '1.2.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 17 Jan 2017 19:58:24 +0000 (14:58 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 17 Jan 2017 19:58:24 +0000 (14:58 -0500)
version 1.2.4


Trivial merge