Merge tag 'v1.2.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 11 May 2015 15:40:29 +0000 (11:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 11 May 2015 15:40:29 +0000 (11:40 -0400)
Version 1.2.0


Trivial merge