am 54b8b436: am de3bfade: Allow properties with spaces in their values

Merge commit '54b8b436a380b053772110796642c7e5e6ba8e64'

* commit '54b8b436a380b053772110796642c7e5e6ba8e64':
  Allow properties with spaces in their values