Merge remote-tracking branch 'upstream/master'

diff --cc CHANGELOG.md
index 72674ec52a25aba096688123ba76d5e5d7d237a4,7ff77396b33905680045a63dd7df8fb8422b1b87..85e7f91527753d1443066bed07527383b18c5b2c
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -4,12 -4,11 +4,13 @@@ This project uses the changelog in acco
  
  ## [Unreleased][unreleased]
  ### Changed
 +- Improved LF manchester and biphase demodulation and ask clock detection especially for reads with heavy clipping. (marshmellow)
  - Iclass read, `hf iclass read` now also reads tag config and prints configuration. (holiman)
+ - *bootrom* needs to be flashed, due to new address boundaries between os and fpga, after a size optimization (piwi)
  
  ### Fixed
 -- Fixed issue #19, problems with LF T55xx commands (marshmellow)
 +- Fixed EM4x50 read/demod of the tags broadcasted memory blocks. 'lf em4x em4x50read' (not page read) (marshmellow)
 +- Fixed issue #19, problems with LF T55xx commands (iceman1001, marshmellow)
  
  ### Added
  - Added changelog