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