Sync'd branch integration/fx-team with upstream @ Tue Oct 21 12:42:43 PDT 2014