ref: 5726e930ecb3c9bbb0d37bc52f90e4f0553be19a
parent: 3b60971fb1018f853e9e8b550f808315a7761faa
 parent: 5fb579cefe331eb9f62585d481dbbec3447a6bad
	author: knik <knik@users.sourceforge.net>
	date: Sun Jul  9 14:03:43 EDT 2017
	
Merge branch 'master' of ssh://git.code.sf.net/p/faac/faac
--
⑨