Sync'd branch integration/fx-team with upstream @ Fri Oct 10 05:58:39 PDT 2014