pong
Merge branch 'hotfix/20140529-pong'