am 149fd6d8: am 9c3fc0cc: am eb95e74e: DO NOT MERGE - Fixed crash for odd image width/height

* commit '149fd6d84d53c7f509418048b931ff2c45e8deb4':
  DO NOT MERGE - Fixed crash for odd image width/height