Merge branch 'release/1.0.5' v1.0.5
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 8 Jul 2015 18:54:20 +0000 (14:54 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 8 Jul 2015 18:54:20 +0000 (14:54 -0400)

Trivial merge