Sync'd branch projects/jamun with upstream @ Tue Sep  2 22:31:03 PDT 2014