I recently installed several plugin and jenkins updates (now on jenkins 2.4). It appears there is a conflict between build_timeout-plugin and the Token Macro Plugin. When I try and run job with a timeout I get the following:

FATAL: Could not evaluate macro
org.jenkinsci.plugins.tokenmacro.MacroEvaluationException: Unrecognized macro 'timeout' in '${timeout}'
at org.jenkinsci.plugins.tokenmacro.TokenMacro.expand(TokenMacro.java:207)
at org.jenkinsci.plugins.tokenmacro.TokenMacro.expandAll(TokenMacro.java:246)
at org.jenkinsci.plugins.tokenmacro.TokenMacro.expandAll(TokenMacro.java:232)
at hudson.plugins.build_timeout.BuildTimeOutStrategy.expandAll(BuildTimeOutStrategy.java:108)
at hudson.plugins.build_timeout.impl.AbsoluteTimeOutStrategy.getTimeOut(AbsoluteTimeOutStrategy.java:44)
at hudson.plugins.build_timeout.BuildTimeoutWrapper$EnvironmentImpl.<init>(BuildTimeoutWrapper.java:166)
at hudson.plugins.build_timeout.BuildTimeoutWrapper.setUp(BuildTimeoutWrapper.java:211)
at hudson.model.Build$BuildExecution.doRun(Build.java:156)
at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:534)
at hudson.model.Run.execute(Run.java:1741)
at hudson.matrix.MatrixRun.run(MatrixRun.java:146)
at hudson.model.ResourceController.execute(ResourceController.java:98)
at hudson.model.Executor.run(Executor.java:410)
FATAL: Unrecognized macro 'timeout' in '${timeout}'

If I remove the build-timeout-plugin the error goes away.