Sync'd branch releases/beta with upstream @ Wed Nov  5 14:12:27 PST 2014