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