Sync'd branch projects/jamun with upstream @ Fri Sep 26 13:07:12 PDT 2014