Hack change the convention. THIS SHOULD NEVER HIT MASTER

Conflicts:
	ReactiveUI/RxApp.cs
Merge branch 'master' into blueline-rxui4
Merge branch 'master' into blueline-rxui4
Merge remote-tracking branch 'origin/master' into blueline-rxui4
Merge remote-tracking branch 'origin/master' into blueline-rxui4
Merge remote-tracking branch 'origin/master' into blueline-rxui4
Merge remote-tracking branch 'origin/master' into blueline-rxui4
Merge remote-tracking branch 'origin/master' into blueline-rxui4
Merge remote-tracking branch 'origin/master' into blueline-rxui4
Merge remote-tracking branch 'origin/master' into GHfW
Merge branch 'master' into GHfW
Merge remote-tracking branch 'origin/master' into GHfW
Merge branch 'master' into GHfW
Merge branch 'master' of https://github.com/rikbosch/ReactiveUI

Conflicts:
	ReactiveUI/RxApp.cs
Merge branch 'master' of https://github.com/rikbosch/ReactiveUI