Sync'd branch integration/fx-team with upstream @ Fri Oct 24 07:03:41 PDT 2014