Sync'd branch projects/pine with upstream @ Fri Aug 29 23:40:17 PDT 2014