Sync'd branch integration/fx-team with upstream @ Sat Sep 20 18:23:38 PDT 2014