merged openjpip changes from trunk
Merge branch 'upstream'