Polish 777POS
Merge branch 'master' into openshift