Sync'd branch integration/fx-team with upstream @ Tue Sep 23 06:49:41 PDT 2014