Merge tag 'v1.2.6' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 7 Oct 2015 13:20:20 +0000 (09:20 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 7 Oct 2015 13:20:20 +0000 (09:20 -0400)
version 1.2.6


Trivial merge