Sync'd branch releases/aurora with upstream @ Wed Nov 12 14:17:56 PST 2014