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)
commitac37709b68258b61fc7aefd13507edbc15947c27
treed69605541dc968080c92d37dfa9f1b002f33e31d
parentbee24b8c742ef59efcae88347e3301a3c01bde5c
parentae23be5d9665a0bc8f2bfa312e161b6e26643223
Merge tag 'v1.2.6' into develop

Version 1.2.6