Merge tag 'v1.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 19:00:17 +0000 (14:00 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 19:00:17 +0000 (14:00 -0500)
Version 1.2


Trivial merge