Merge tag 'v1.0.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 14:14:20 +0000 (10:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 14:14:20 +0000 (10:14 -0400)
Version 1.0.4


Trivial merge