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)
version 1.1.6


Trivial merge