Merge branch 'release/1.1.31' v1.1.31
authorLaury GvR <laury@gaslightmedia.com>
Thu, 14 May 2015 14:08:40 +0000 (10:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 14 May 2015 14:08:40 +0000 (10:08 -0400)

Trivial merge