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