Merge dev (20141218-1)

Merging dev branch.