Sync'd branch releases/aurora with upstream @ Wed Nov 12 09:37:53 PST 2014