Sync'd branch projects/date with upstream @ Mon Sep 22 14:59:06 PDT 2014