Merge branch 'intefl/svn_merge' of 165.213.149.219:/slp/pkgs/e/elementary into intefl...