Sync'd branch projects/maple with upstream @ Mon Sep 15 12:54:09 PDT 2014