Using consistent margins for tips and code blocks.
Fixed regression due to stale OS X glext header.

Fixes regression caused by b140606a49.
Merge remote-tracking branch 'upstream/master'