merged with master
Merge branch 'master' into cvmfs-2.1.6
bumped version number