Sync'd branch projects/date with upstream @ Thu Oct 16 08:18:08 PDT 2014