acu161341 fixed typo
Merge branch 'sapphire_14_07_acu161341_testing_server_and_client'