Sync'd branch projects/jamun with upstream @ Fri Sep 12 09:44:09 PDT 2014