Sync'd branch integration/fx-team with upstream @ Sun Oct 12 21:31:41 PDT 2014