Sync'd branch releases/aurora with upstream @ Wed Nov  5 17:18:40 PST 2014