Sync'd branch projects/alder with upstream @ Fri Oct 17 15:03:55 PDT 2014