Merge branch 'release/1.2.10' v1.2.10
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 15:41:50 +0000 (11:41 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 25 May 2017 15:41:50 +0000 (11:41 -0400)

Trivial merge