Merge branch 'hotfix/1.1.27'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 19:15:41 +0000 (14:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 19:15:41 +0000 (14:15 -0500)

Trivial merge