[php-channel-digitalsandwich/f17] (2 commits) ...Merge branch 'master' into f17

[Christof Damian]

Summary of changes:

  9d67034... import (*)
  30008b2... Merge branch 'master' into f17

(*) This commit already existed in another branch; no separate mail sent