Sync'd branch projects/jamun with upstream @ Mon Sep  8 22:15:07 PDT 2014