Merge branch 'release/1.1.17' v1.1.17
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Sep 2016 18:34:48 +0000 (14:34 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Sep 2016 18:34:48 +0000 (14:34 -0400)

Trivial merge