Commit d17d1d03eede91e795f32048b5bd3acc46659c97

Merging from master branch on git.pantoto.org