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