Merge branch 'release/1.1.10' v1.1.10
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Feb 2017 19:16:56 +0000 (14:16 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Feb 2017 19:16:56 +0000 (14:16 -0500)

Trivial merge