Sync'd branch projects/jamun with upstream @ Fri Sep 26 16:18:10 PDT 2014