Merge branch 'release/1.3.2' v1.3.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Apr 2015 18:45:56 +0000 (14:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 8 Apr 2015 18:45:56 +0000 (14:45 -0400)

Trivial merge