Merge branch 'release/1.2.11' v1.2.11
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Apr 2017 16:14:41 +0000 (12:14 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Apr 2017 16:14:41 +0000 (12:14 -0400)

Trivial merge