Sync'd branch integration/fx-team with upstream @ Wed Oct 15 16:28:44 PDT 2014