Merge commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c' * commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c': Change in media scanner to set correct date
Merge commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c' * commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c': Change in media scanner to set correct date