Sync'd branch integration/fx-team with upstream @ Sat Sep  6 08:26:37 PDT 2014