mattdrayer/rebase-20140722: Functional stabilization