Sync'd branch releases/beta with upstream @ Fri Nov  7 07:58:47 PST 2014