Merge gomspace's master branch to bring in all the updates.