Sync'd branch projects/pine with upstream @ Wed Sep 10 11:45:19 PDT 2014