Merge branch 'hotfix/1.1.7' v1.1.7
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:52:53 +0000 (15:52 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:52:53 +0000 (15:52 -0500)
commitc599064bd37802e670aee67290aa76ab197d7af6
tree2f1a79e16bef991ad6c82b72c4ae2e439f205196
parentd8d356daec80368217798f31092842bfe819d1c3
parent71e0890d1d7e0cc9889c30c0a0f10f96cee1b093
Merge branch 'hotfix/1.1.7'