Merge tag 'v1.0.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Apr 2015 15:14:45 +0000 (11:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Apr 2015 15:14:45 +0000 (11:14 -0400)
Version 1.0.5


Trivial merge