Sync'd branch integration/fx-team with upstream @ Fri Oct 31 12:47:57 PDT 2014