ref #1293 -- restore merge line
ref #1293 -- restore merge line

timber/timber,jarednova/timber,josephbergdoll/timber,gchtr/timber,gchtr/timber,josephbergdoll/timber,jarednova/timber,josephbergdoll/timber,gchtr/timber,jarednova/timber,timber/timber