Sync'd branch integration/fx-team with upstream @ Fri Oct 17 15:20:37 PDT 2014