This file conflicted when I merged in master (probably because I forgot to discard a local change using jackrabbit). Should all be the same as master here, sorry for the mess. ;)