Sync'd branch integration/fx-team with upstream @ Tue Oct  7 16:55:46 PDT 2014