Sync'd branch integration/fx-team with upstream @ Fri Sep  5 00:41:37 PDT 2014