Upgrade to 3.1.

Most of the required updates for this module came from the external content upgrade to 3.1.