Sync'd branch integration/fx-team with upstream @ Fri Oct 10 19:19:44 PDT 2014