Sync'd branch projects/jamun with upstream @ Fri Sep  5 21:11:13 PDT 2014