Merge tag 'v1.0.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:58:04 +0000 (14:58 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 19:58:04 +0000 (14:58 -0500)
Version 1.0.4


Trivial merge