Sync'd branch projects/pine with upstream @ Tue Oct 28 14:01:16 PDT 2014