Upgrade instructions.

see #526
Merge branch '1.1.x'