Sync'd branch releases/beta with upstream @ Mon Nov  3 14:23:42 PST 2014