Merge branch 'release-6.1.1'
Updated submodules and version.
Corrected tools/build-android.osx.
Update submodule (correctly this time!).
[[ ResolveImage ]] Implemented resolve image for all modes
[[ ResolveImage ]] removed _internal version as it's not required if this change is accepted
[[ ResolveImage ]] Added documentation for the new command
Merge branch 'feature-resolve_image' into develop