Sync'd branch releases/aurora with upstream @ Mon Nov 10 10:56:53 PST 2014