Merge tag 'v1.0.4' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 11 Dec 2015 21:49:08 +0000 (16:49 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 11 Dec 2015 21:49:08 +0000 (16:49 -0500)
1.0.4


Trivial merge