Sync'd branch projects/jamun with upstream @ Fri Sep 19 13:25:16 PDT 2014