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