Merge master branch into ubuntu-12.04