Sync'd branch projects/alder with upstream @ Tue Oct 28 15:46:00 PDT 2014