[PAXWEB-740] - Upgrade to latest master for easier releasing