Merge branch 'release/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Mon, 13 Apr 2015 13:23:03 +0000 (09:23 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 13 Apr 2015 13:23:03 +0000 (09:23 -0400)

Trivial merge