Sync'd branch integration/fx-team with upstream @ Fri Oct 17 08:30:42 PDT 2014