Sync'd branch integration/fx-team with upstream @ Tue Oct 21 19:11:43 PDT 2014