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