Sync'd branch integration/fx-team with upstream @ Tue Oct 21 17:31:40 PDT 2014