Merge tag 'v1.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 11 May 2016 14:13:06 +0000 (10:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 11 May 2016 14:13:06 +0000 (10:13 -0400)
Version 1.2.0


Trivial merge