base

Merge changes I60c09f33,Ie0134c2b into lmp-mr1-dev

* changes:
  Add new parameter to the render method to allow forcing a measure pass.
  Avoid caching mImage on the main render loop and use clipping.