Merge tag 'v1.2.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Dec 2016 16:30:27 +0000 (11:30 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Dec 2016 16:30:27 +0000 (11:30 -0500)
Version 1.2.4


Trivial merge