Paranoid update to 3.1.0

Change-Id: Id1be5b08da0477a36561a4fcfa0878e9f09c54e1