Bugfixes.
Merge remote-tracking branch 'origin/develop'
Critical bug fixes.
Bumping version to go into production.