Sync'd branch releases/aurora with upstream @ Sun Nov  2 13:48:32 PST 2014