We do not use vcr anymore (webmock it is)
Merge remote-tracking branch 'upstream/master' into scrollable_edit_box

# 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.