Y2014: merge changes from main repo

Bring the openstrike copy up to date.