Sync'd branch integration/fx-team with upstream @ Tue Sep 23 13:47:40 PDT 2014