Merge tag '1.0.5' into develop
authorIan Weller <ian@gaslightmedia.com>
Fri, 17 Mar 2017 20:28:10 +0000 (16:28 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 17 Mar 2017 20:28:10 +0000 (16:28 -0400)
version 1.0.5


Trivial merge