Development

Merge dev branch into master (20141222-1).