Bugfix: Adjustments for Mac OS X 10.11 (El Capitan). Author: Martin Beaudoin. Merge...