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