That little guy... (#1927)
Merge commit '9b7ac03da971a2e5bf35262d252241856e02debe'