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