Post-incremental-release housekeeping (Update master branch)

Self explanatory housekeeping.