Merge tag 'v1.2.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 17:32:13 +0000 (13:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 17:32:13 +0000 (13:32 -0400)
Version 1.2.4


Trivial merge