Merge tag 'v1.0.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Dec 2016 18:20:03 +0000 (13:20 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 13 Dec 2016 18:20:03 +0000 (13:20 -0500)
Version 1.0.5


Trivial merge