Merge tag 'v1.0.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 19:13:33 +0000 (14:13 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 19:13:33 +0000 (14:13 -0500)
Version 1.0.4


Trivial merge