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