Branch trunk to 1.6.x in preparation for refactoring to latest ZeroMQ version.