Merge branch 'release/1.3.2' v1.3.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Jan 2016 15:21:21 +0000 (10:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Jan 2016 15:21:21 +0000 (10:21 -0500)

Trivial merge