Start of 2.5.1 branch + Tentative fix for #575 NPE while getting image overlay.
Was already merged in Bitbucket before import, marked as merged by the import user
- Starting '2.5.1' branch.
- Updated version to 2.5.1
- Tentative fix for #575 (closed) NPE while getting image overlay.