Merge branch 'release/1.1.3' v1.1.3
authorLaury GvR <laury@gaslightmedia.com>
Thu, 26 May 2016 18:57:24 +0000 (14:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 26 May 2016 18:57:24 +0000 (14:57 -0400)

Trivial merge