Sync'd branch projects/pine with upstream @ Wed Sep 17 02:29:15 PDT 2014