Speed-up combinator and fix problems with two disciplines conflicts totally
Short URL when available to avoid problems when publishing to Facebook
Merge commit 'd9c2525a8fc6eac745fdcfba558ef1faeaae8d57' into feature/usability-fixes