Changes with Aloha.Editor 2.1.2


Bugfix SUP-17927

Fixed access to invalid variables due to merge conflicts