Master Sync 2013-02-03

Syncing with Paradise main.