Apply changes since 2014-07-01 (fixes #25)