Merge tag 'v1.0.5' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 2 Dec 2015 16:07:33 +0000 (11:07 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 2 Dec 2015 16:07:33 +0000 (11:07 -0500)
Version 1.0.5


Trivial merge