Merge branch 'release/1.2.4' v1.2.4
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Dec 2016 14:45:06 +0000 (09:45 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Dec 2016 14:45:06 +0000 (09:45 -0500)

Trivial merge