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