iss54-commit1
iss54-commit2
iss54-commit3
Merge remote-tracking branch 'origin/master'