Merge branch 'release/1.2.8' v1.2.8
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Feb 2017 20:18:51 +0000 (15:18 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Feb 2017 20:18:51 +0000 (15:18 -0500)

Trivial merge