Sync'd branch integration/fx-team with upstream @ Fri Oct 10 07:25:47 PDT 2014