140818 2

Merged Wataru Takase requested to merge 140818_2 into master

Merge request reports