Merge branch 'release/1.1.15' v1.1.15
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 15:41:14 +0000 (11:41 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 15:41:14 +0000 (11:41 -0400)

Trivial merge