Sync'd branch integration/fx-team with upstream @ Fri Sep 26 14:05:45 PDT 2014