Improved merge, updated alpaca
Merge branch '1.1.8-RELEASE'
Updated version numbers.