Merge remote-tracking branch "upstream/master"

Commit changes from orinal "getkirby" repository