Merge branch 'release/1.2.32' v1.2.32
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Oct 2014 15:17:42 +0000 (11:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 14 Oct 2014 15:17:42 +0000 (11:17 -0400)

Trivial merge