Sync'd branch releases/beta with upstream @ Wed Nov  5 07:59:33 PST 2014