Sync'd branch releases/aurora with upstream @ Mon Nov 10 05:31:54 PST 2014