Merging master back to unstable

No code changes, since change was already committed to unstable.