Sync'd branch releases/aurora with upstream @ Mon Nov 10 14:48:07 PST 2014