Merge branch '167_quoted' into rolk