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