Merge tag 'v1.2.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Oct 2015 15:27:39 +0000 (11:27 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Oct 2015 15:27:39 +0000 (11:27 -0400)
Version 1.2.4


Trivial merge