Sync'd branch releases/beta with upstream @ Mon Nov 10 06:17:46 PST 2014