migrations
merge from upstream master:
fixed syntax error