Sync'd branch projects/jamun with upstream @ Tue Sep  9 10:53:08 PDT 2014