Merge branch 'hotfix/1.1.7' v1.1.7
authorIan Weller <ian@gaslightmedia.com>
Mon, 13 Feb 2017 20:51:52 +0000 (15:51 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 13 Feb 2017 20:51:52 +0000 (15:51 -0500)
commitf0d57d5854689c4448bb761ebf07014f598cf2d4
treef4aaa3a2026944f22c9a02f455607afc291b5103
parentcecbace4fb60907fb96ede3b21b32f53f8fdfd80
parent605a839cef6d8602aff3880e5c098462820b9fa7
Merge branch 'hotfix/1.1.7'