Updated remove_rjs branch.
Merge branch 'master' into live