Re-basing recent changes to master.