Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes

diff --cc boot.php
Simple merge

diff --cc include/Contact.php
Simple merge

diff --cc include/diaspora.php
Simple merge

diff --cc mod/community.php
Simple merge

diff --cc mod/photos.php
Simple merge

diff --cc mod/wall_attach.php
Simple merge