Sync'd branch projects/pine with upstream @ Fri Oct 31 14:07:37 PDT 2014