Sync'd branch releases/beta with upstream @ Wed Nov  5 11:40:34 PST 2014