Merge tag 'v1.1.7' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:53:22 +0000 (15:53 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:53:22 +0000 (15:53 -0500)
version 1.1.7


Trivial merge