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