repairs default context
bumps build number
Merge remote-tracking branch 'origin'