Sync'd branch integration/fx-team with upstream @ Tue Oct 14 01:12:56 PDT 2014