Merge testing to master?

It has been testing since 2014-08-24.

I would only hope for https://github.com/ProgVal/Limnoria/issues/854  to appear before this merge happens, but as it was opened 23 days ago, that probably isn't going to happen in near future.