Merge branch 'hotfix/1.1.3' v1.1.3
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:37:14 +0000 (13:37 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:37:14 +0000 (13:37 -0500)

Trivial merge