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