Merge branch 'develop' into fix_logp
Merge branch 'develop' into fix_logp
Merge branch 'fix_logp' of https://github.com/inpho/vsm into fix_logp
Merge branch 'fix_logp' of https://github.com/inpho/vsm into fix_logp
Merge branch 'fix_logp' of https://github.com/inpho/vsm into fix_logp
resolved conflict
Merge branch 'fix_logp' into develop