Sync'd branch releases/beta with upstream @ Wed Nov  5 17:02:43 PST 2014