Syncing unstable with CM11: contains README edits