Sync'd branch integration/fx-team with upstream @ Fri Sep 19 00:37:41 PDT 2014