Removed selfupdate as it was only meant for internal use
Merge remote-tracking branch 'flx5/master'