Merge remote-tracking branch 'origin/master' into search
Fixes #193.
Forgot to remove console.log().
merge
Merge commit 'f78dc7bb67554dc713585914f1299be35c56fbc0'