Merge tag 'v1.2.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Oct 2016 15:38:42 +0000 (11:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Oct 2016 15:38:42 +0000 (11:38 -0400)
Version 1.2.2


Trivial merge