merging commits since 09/28/2013

commit details below