Merge tag 'v1.1.6' into develop
authorIan Weller <ian@gaslightmedia.com>
Mon, 19 Dec 2016 17:47:37 +0000 (12:47 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 19 Dec 2016 17:47:37 +0000 (12:47 -0500)
commitafd36cdf800390216db01c028c26a5f0244cceb0
tree62b2ea8c55802d0e38f26cd31dbf79e5fb53e278
parent4266714b557164155bbd7a38723fd0831a4d415c
parentcecbace4fb60907fb96ede3b21b32f53f8fdfd80
Merge tag 'v1.1.6' into develop

version 1.1.6