Merge tag 'v1.3.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 May 2015 20:30:31 +0000 (16:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 May 2015 20:30:31 +0000 (16:30 -0400)
Version 1.3.0


Trivial merge