Merge tag 'v1.1.7' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:53:22 +0000 (15:53 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:53:22 +0000 (15:53 -0500)
commitaf60dceca6d1153d3d2abace676bafe2113ee51a
tree2f1a79e16bef991ad6c82b72c4ae2e439f205196
parentd494e10991c17e329289e9b844fd23868d4e5328
parentc599064bd37802e670aee67290aa76ab197d7af6
Merge tag 'v1.1.7' into develop

version 1.1.7