Merge tag 'v1.0.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 19:38:47 +0000 (14:38 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 23 Feb 2016 19:38:47 +0000 (14:38 -0500)
Version 1.2.5


Trivial merge