Thanks for this Niels Heinemann - are you able to submit this as a pull-request? I can convert the patch for you if not.
https://github.com/civicrm/civicrm-core/pull/7954
2nd PR looks good, thanks!
Thanks for this Niels Heinemann - are you able to submit this as a pull-request? I can convert the patch for you if not.