Manually merge the recent pull requests (!393) · Merge requests · Stephan / mom-ca · GitLab

Stephan requested to merge github/fork/yngwi/master into master Feb 02, 2016

Created by: yngwi

Manually merged all pull requests but omitted commit https://github.com/StephanMa/mom-ca/commit/106f0b62c9e2c041f52774b94e7e7cb2336a6943 as it seems to cause problems with the editor(see attached screenshot)