Devel merge
fixed merge conflict again

author: nhhughes