Merge branch 'hotfix/1.1.8' v1.1.8
authorIan Weller <ian@gaslightmedia.com>
Mon, 13 Feb 2017 22:10:10 +0000 (17:10 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 13 Feb 2017 22:10:10 +0000 (17:10 -0500)
commit0c203534bace10e7b5a2969c6ce580da1934cbf4
tree20b2a6c5e975888dfcb6f33b0516f620a656357d
parentf0d57d5854689c4448bb761ebf07014f598cf2d4
parentea0f17b063834f08b5de2d87ff2e5fde9259b218
Merge branch 'hotfix/1.1.8'