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