Sync'd branch integration/fx-team with upstream @ Tue Oct 21 13:03:41 PDT 2014