Sync'd branch integration/fx-team with upstream @ Sat Sep  6 18:41:38 PDT 2014