Sync'd branch releases/aurora with upstream @ Wed Nov  5 06:37:31 PST 2014