Sync'd branch integration/fx-team with upstream @ Fri Oct 17 06:17:39 PDT 2014