Sync'd branch projects/maple with upstream @ Mon Sep 29 09:18:51 PDT 2014