Sync to joomla/joomla-cms@bc388b4fda2c94a7e89c0489c9e71b1f09775fa0 (Ref #22)
Sync to joomla/joomla-platform@34a9a93bb0b363433fd5e512c7e66ce3c2b6f40c (Ref #22)