Sync'd branch projects/pine with upstream @ Sun Sep 21 13:51:21 PDT 2014