Merge tag 'v1.0.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 16:28:36 +0000 (11:28 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 16:28:36 +0000 (11:28 -0500)
Version 1.0.5


Trivial merge