Sync'd branch integration/fx-team with upstream @ Tue Oct 21 05:27:40 PDT 2014