am 0078570c: Merge "Removing crosshairs" into jb-dev

* commit '0078570ca1323ea418306a70d091f8694de5ac9b':
  Removing crosshairs