Merge changes from jpetazzo:master