Merge branch 'master' into openjpeg-2.1

diff --cc README.md
index 19186641a9f2001bf6e900c60ecce731ae450bb0,f1438de49f98398f2c887c570dffc2c77022c676..1c19a0f3ad44eca10df0efb04521dc472f4c72ee
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -71,9 -73,10 +73,10 @@@ API available is the one supported by O
  [comment-license]: https://img.shields.io/github/license/uclouvain/openjpeg.svg "https://img.shields.io/badge/license-BSD--2--Clause-blue.svg"
  [badge-license]: https://img.shields.io/badge/license-BSD--2--Clause-blue.svg "BSD 2-clause "Simplified" License"
  [link-license]: https://github.com/uclouvain/openjpeg/blob/master/LICENSE "BSD 2-clause "Simplified" License"
 -[badge-build]: https://travis-ci.org/uclouvain/openjpeg.svg?branch=master "Build Status"
 +[badge-build]: https://travis-ci.org/uclouvain/openjpeg.svg?branch=openjpeg-2.1 "Build Status"
  [link-build]: https://travis-ci.org/uclouvain/openjpeg "Build Status"
 -[badge-msvc-build]: https://ci.appveyor.com/api/projects/status/github/uclouvain/openjpeg?branch=master&svg=true "Windows Build Status"
 -[link-msvc-build]: https://ci.appveyor.com/project/detonin/openjpeg/branch/master "Windows Build Status"
 +[badge-msvc-build]: https://ci.appveyor.com/api/projects/status/github/uclouvain/openjpeg?branch=openjpeg-2.1&svg=true "Windows Build Status"
 +[link-msvc-build]: https://ci.appveyor.com/project/detonin/openjpeg/branch/openjpeg-2.1 "Windows Build Status"
  [badge-coverity]: https://scan.coverity.com/projects/6383/badge.svg "Coverity Scan Build Status"
  [link-coverity]: https://scan.coverity.com/projects/uclouvain-openjpeg "Coverity Scan Build Status"
+ [link-api-timeline]: http://www.openjpeg.org/abi-check/timeline/openjpeg "OpenJPEG API/ABI timeline"