infinite loop fix for injecting
fix out of fds condition when indexing images.
fix make master-deb
Merge branch 'master' into testing
Merge branch 'master' into testing
Merge branch 'testing' into diffbot-testing

Conflicts:
	PageInject.cpp