Sync'd branch integration/fx-team with upstream @ Sat Sep 13 11:37:39 PDT 2014