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