Sync'd branch integration/fx-team with upstream @ Fri Oct 31 15:09:36 PDT 2014