Fixed problem with legacy and new output system (closes #2687)
Merge commit '48d1b88cecd2f908a1fea963ec55b39c2b856f3e'