Critical fix concerning compatibility with previous functionality.
Merge remote-tracking branch 'origin/master'