Merge dev (20141224-1)

Merge dev branch (20141224-1)