Sync'd branch projects/pine with upstream @ Fri Nov  7 11:08:20 PST 2014