Merge tag 'v1.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Oct 2014 14:47:23 +0000 (10:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Oct 2014 14:47:23 +0000 (10:47 -0400)
Version 1.2


Trivial merge