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