Sync'd branch projects/maple with upstream @ Mon Sep 29 12:45:17 PDT 2014