fixes #314: the data passed to htmlOutputBinding could be null
Merge remote-tracking branch 'origin/master' into feature/layout-cleanup