Merge tag 'v1.0.6' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 9 Jul 2015 16:19:07 +0000 (12:19 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 9 Jul 2015 16:19:07 +0000 (12:19 -0400)
Version 1.0.6


Trivial merge