Sync'd branch integration/fx-team with upstream @ Tue Oct 14 23:58:40 PDT 2014