Merge tag 'v1.2.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Dec 2016 14:45:14 +0000 (09:45 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Dec 2016 14:45:14 +0000 (09:45 -0500)
Version 1.2.4


Trivial merge