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