Merge tag 'v1.0.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jul 2014 17:37:13 +0000 (13:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jul 2014 17:37:13 +0000 (13:37 -0400)
Version 1.0.5


Trivial merge