Sync'd branch projects/maple with upstream @ Mon Sep 29 14:27:15 PDT 2014