Sync'd branch projects/alder with upstream @ Tue Oct 21 10:37:52 PDT 2014