Sync'd branch integration/fx-team with upstream @ Tue Oct 28 13:57:38 PDT 2014