Sync'd branch integration/fx-team with upstream @ Fri Oct 10 13:16:36 PDT 2014