Merge remote-tracking branch 'elafargue/photosphere/master'

- Resolved conflicts and merged with elafargue/photosphere@91bc9fddd11cb8713a7e4d25d7628bd69ae51ad0
- Bugfix: Scale image only if it exceeds max 2D texture size.