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