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