Merge pull request #1 from almost/master

Merge from master
Merge pull request #6 from almost/master

Merge from master
hubbub: Add a comment
Merge pull request #2 from hubbubcomments/comment-1415721304659

Comment 1415721304659