Merge tag 'v1.2.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 14:54:34 +0000 (09:54 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 14:54:34 +0000 (09:54 -0500)
Version 1.2.6


Trivial merge