WIP 1.1.4

Contains work to be included as part of version 1.1.4.

This version contains only a critical fix for the distributable file of 1.1.3, which will be skipped in production in favour of this *working* version.