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