openrtm_aist: 1.1.0-20 in 'indigo/distribution.yaml' [bloom]
Merge branch 'master' of http://github.com/ros/rosdistro into bloom-openrtm_aist-1

Conflicts:
	indigo/distribution.yaml
Merge pull request #6017 from k-okada/bloom-openrtm_aist-1

openrtm_aist: 1.1.0-20 in 'indigo/distribution.yaml' [bloom]