Merge branch 'master' into devel
Merge branch 'devel' of github.com:sehlen/psage into devel
Merge remote-tracking branch 'origin/devel' into devel