Merge branch 'release/1.1.8' v1.1.8
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jul 2016 17:47:17 +0000 (13:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jul 2016 17:47:17 +0000 (13:47 -0400)

Trivial merge