Sync'd branch projects/alder with upstream @ Tue Oct 28 13:14:57 PDT 2014