Sync'd branch releases/aurora with upstream @ Wed Nov  5 14:01:54 PST 2014