Merge tag 'v1.1.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 15:42:48 +0000 (11:42 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 May 2017 15:42:48 +0000 (11:42 -0400)
Version 1.1.6


Trivial merge