Sync'd branch projects/date with upstream @ Tue Oct 21 12:24:04 PDT 2014