Merge branch 'release/1.1.2' V1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Wed, 6 Aug 2014 18:32:40 +0000 (14:32 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 6 Aug 2014 18:32:40 +0000 (14:32 -0400)

Trivial merge