Merge tag 'v1.1.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 4 Nov 2016 15:06:02 +0000 (11:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 4 Nov 2016 15:06:02 +0000 (11:06 -0400)
Version 1.1.6


Trivial merge