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