Merging 1.2-dev head to master head.