Sync'd branch projects/jamun with upstream @ Mon Sep 29 10:07:09 PDT 2014