Merge commit 'd5d8dfded0cc3da3a26c168eea009f0f93399ed5' into angular_js_archetype