Sync'd branch integration/fx-team with upstream @ Fri Sep 19 18:46:40 PDT 2014