Sync'd branch integration/fx-team with upstream @ Tue Oct 28 05:10:40 PDT 2014