Merge tag 'v1.0.5' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Dec 2015 21:53:17 +0000 (16:53 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Dec 2015 21:53:17 +0000 (16:53 -0500)
1.0.5


Trivial merge