Sync'd branch integration/fx-team with upstream @ Sun Oct 12 23:45:42 PDT 2014