Sync'd branch projects/jamun with upstream @ Sat Sep  6 11:48:06 PDT 2014