Syntax errors in merge

2afbf0aa results in syntax errors which prohibits the post install to run properly.