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