Add code blocks for build instructions
Merge remote-tracking branch 'upstream/master'