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