Sync'd branch projects/date with upstream @ Tue Sep 30 17:49:01 PDT 2014