TauLabs/TauLabs — pull request #1372 by peabody124 (2014-10-24 23:19:25+00:00)
Title: Next master merge

Fix some conflicts between master and next to allow merging next release.

No functional changes (just one empty line). Will merge when jenkins says ok.