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