Merge tag 'v1.0.17' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 16:58:03 +0000 (12:58 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 16:58:03 +0000 (12:58 -0400)
version 1.0.17


Trivial merge