add comment for alternate source
update onebox
Merge remote-tracking branch 'upstream/master'