Work for rrmbv12 builds
Merge pull request #16 from jetty840/dnewman-merge

Work for rrmbv12 builds