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