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