Update master to include stable development changes and bugfixes.
This will create a new commit in order to revert the existing changes.
