Merge tag 'v1.2.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 18:40:03 +0000 (14:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 18:40:03 +0000 (14:40 -0400)
Version 1.2.4


Trivial merge