re #148: Merge into development branch
re #148: Merge into development branch

timble/kodekit-platform,timble/kodekit-platform,timble/kodekit-platform,nooku/nooku-platform,timble/kodekit-platform,nooku/nooku-platform,nooku/nooku-platform,timble/kodekit-platform,nooku/nooku-platform,nooku/nooku-platform