Merge tag 'v1.0.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 16:21:30 +0000 (11:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 16:21:30 +0000 (11:21 -0500)
Version 1.0.4


Trivial merge