Merge branch 'hotfix/20141217-inside'
lineapps
Merge branch 'hotfix/20141217-lineapps' into develop