Merge branch 'master' into 'master'

Marius Cramer

2015-01-10 0d5e54e5a149a24f8cc04989be2e7611d98852a4

install/sql/incremental/upd_0081.sql does not exist in tree d705b7bfb93339a2c37b138a18ed965c59343a8f