Sync'd branch releases/aurora with upstream @ Sun Nov  2 17:27:25 PST 2014