2014-02-07 Master Sync

Syncing our code with Paradise's.