Merge master into scala_2.10

* Created a branch off of scala_2.10 and merged master into it
* Fixed merge conflict in Formats
* Minor refactoring in Formats