Sync'd branch releases/beta with upstream @ Wed Nov  5 13:46:32 PST 2014