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