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