Sync'd branch releases/aurora with upstream @ Wed Nov  5 13:32:56 PST 2014