beacons out
Merge remote-tracking branch 'origin/master'
resolution bugs
Merge remote-tracking branch 'origin/master'