Merge branch 'hotfix/1.1.6' v1.1.6
authorIan Weller <ian@gaslightmedia.com>
Mon, 19 Dec 2016 17:47:09 +0000 (12:47 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 19 Dec 2016 17:47:09 +0000 (12:47 -0500)
commitcecbace4fb60907fb96ede3b21b32f53f8fdfd80
tree62b2ea8c55802d0e38f26cd31dbf79e5fb53e278
parent13a6a9ff3f28bff7ef1e6b81f40c341354425186
parentcb8972583031398d0345c0ba02332961ac190fbf
Merge branch 'hotfix/1.1.6'