1.2.5 WIP (Final)

Woops! I forgot to commit the final 1.2.5 code before merging into master.