Merge branch 'release/1.2.6' v1.2.6
authorIan Weller <ian@gaslightmedia.com>
Wed, 7 Oct 2015 13:20:00 +0000 (09:20 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 7 Oct 2015 13:20:00 +0000 (09:20 -0400)

Trivial merge