Merge branch 'hotfix/1.2.9' v1.2.9
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Feb 2017 20:28:33 +0000 (15:28 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Feb 2017 20:28:33 +0000 (15:28 -0500)

Trivial merge