Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/base/filepush.cpp
Merge branch 'master', remote-tracking branch 'origin'