Sync'd branch integration/fx-team with upstream @ Sun Oct 26 19:25:45 PDT 2014