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