Merge remote-tracking branch 'ispc3master/master'

Dominik

2015-01-11 4d29e42f99f7a9b703be4764034d6794464dad26

install/sql/incremental/upd_0081.sql does not exist in tree 385597a38ab4408c9e26d301ba800d69e371d491