Merge branch 'release/1.2.6' v1.2.6
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 13 Feb 2017 20:14:30 +0000 (15:14 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 13 Feb 2017 20:14:30 +0000 (15:14 -0500)

Trivial merge