Having too much trouble releasing this way, no harm in including.
Merge remote-tracking branch 'openntf/master'