Sync'd branch integration/fx-team with upstream @ Sun Oct 12 22:43:46 PDT 2014