Changed to new Subject implementation
Merge remote-tracking branch 'upstream/develop' into issue#550
Merge pull request #561 from Junkern/issue#550

Issue#550