Sync'd branch integration/fx-team with upstream @ Sun Oct 26 18:15:13 PDT 2014