Merge branch 'master' into develop
missed that one

Signed-off-by: Kwpolska <kwpolska@gmail.com>
Modified timestamp generation

Signed-off-by: Kwpolska <kwpolska@gmail.com>
Merge branch 'release/3.1.2'
new PKGBUILD; fixes for git-flow in progress

Signed-off-by: Kwpolska <kwpolska@gmail.com>