Sync'd branch integration/fx-team with upstream @ Fri Sep  5 19:20:47 PDT 2014