Merge remote-tracking branch 'pnp/master'

This commit is contained in:
tv 2015-07-29 15:36:55 +02:00
commit 62a766c45a