Merging master to unstable

Forgot to do this the other day with the README updates.