Merge from upstream/master syntax fix