Commit 2014-12-17
Merge branch 'master' of https://github.com/rpc-scandinavia/rpc-base