Sync'd branch projects/pine with upstream @ Tue Sep 16 05:19:11 PDT 2014