Merge dev (20141227-2)