Sync'd branch integration/fx-team with upstream @ Tue Oct 28 16:51:44 PDT 2014