keep in sync with OGN upstream (SVN-317)