Merge tag 'v1.0.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 15:51:24 +0000 (10:51 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Nov 2015 15:51:24 +0000 (10:51 -0500)
Version 1.0.4


Trivial merge