Merge tag 'v1.0.4' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 1 Dec 2015 20:23:49 +0000 (15:23 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 1 Dec 2015 20:23:49 +0000 (15:23 -0500)
Security Updates


Trivial merge