Sync'd branch integration/fx-team with upstream @ Sun Oct 26 17:30:21 PDT 2014