Merge tag 'v1.0.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Feb 2015 16:56:36 +0000 (11:56 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Feb 2015 16:56:36 +0000 (11:56 -0500)
Version 1.0.5


Trivial merge