Workaround for fb bug 150994045070167
Merge branch 'dev'