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