Sync'd branch integration/fx-team with upstream @ Tue Oct 28 14:35:40 PDT 2014