Merge tag 'v1.2.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Nov 2015 20:06:57 +0000 (15:06 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Nov 2015 20:06:57 +0000 (15:06 -0500)
Version 1.2.4


Trivial merge