Merge tag 'v1.2.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 20:55:07 +0000 (16:55 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Apr 2016 20:55:07 +0000 (16:55 -0400)
Version 1.2.6


Trivial merge