Sync'd branch projects/pine with upstream @ Sat Sep 13 06:29:13 PDT 2014