Merge branch 'release/1.2.9' v1.2.9
authorIan Weller <ian@gaslightmedia.com>
Wed, 22 Mar 2017 17:53:24 +0000 (13:53 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 22 Mar 2017 17:53:24 +0000 (13:53 -0400)

Trivial merge