Sync'd branch integration/fx-team with upstream @ Tue Oct 21 06:17:48 PDT 2014