simple demo
Merge commit 'f7802d14a12a153fbe035262ba4a1f670e6428f6'

oFriendlyPlugin

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.