Sync'd branch projects/pine with upstream @ Tue Sep 16 01:21:13 PDT 2014