Fix/various 20141118

@grkvlt not sure how your commit "Patch for unmerged changes in Brooklyn PR 337" got into my branch and into this PR.
Did you do a `git push -f` to remove it from master by any chance?