Merge branch 'hotfix/1.1.3' v1.1.3
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:21:54 +0000 (13:21 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 17:21:54 +0000 (13:21 -0400)

Trivial merge