[trunk] Sync OPJViewer with 1.5 version