Sync'd branch projects/alder with upstream @ Mon Oct 27 15:48:53 PDT 2014