Conforming to Polymer coding style.
Merge branch 'stack_overflow_fix' into develop