Sync'd branch projects/maple with upstream @ Tue Sep 23 10:22:08 PDT 2014