Merge dev (20141230-1)

Refactorings.