Sync'd branch projects/date with upstream @ Fri Oct 10 21:16:03 PDT 2014