merged openjpip changes from trunk
Merge branch 'master' into develop