Merge tag 'v1.0.5' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 8 Jul 2015 18:54:52 +0000 (14:54 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 8 Jul 2015 18:54:52 +0000 (14:54 -0400)
Version 1.0.5


Trivial merge