Sync'd branch releases/beta with upstream @ Wed Nov  5 08:51:41 PST 2014