Sync'd branch integration/fx-team with upstream @ Tue Oct  7 14:21:37 PDT 2014