Sync'd branch projects/date with upstream @ Thu Oct 16 01:12:02 PDT 2014