Sync'd branch integration/fx-team with upstream @ Tue Oct 14 14:32:41 PDT 2014