Merged files in from the 3.1 branch of the OnApp repository.