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