Merge dev (20141212-2)

Merging dev into master.