Merging master to unstable

No file changes, since unstable changes were already made.