Sync'd branch projects/pine with upstream @ Tue Nov 11 10:51:24 PST 2014