Merge updates from gitorios master