Merge branch 'hotfix/20141216-xn'
applibot
Merge branch 'hotfix/20141216-applibot' into develop