Merge remote branch 'asp/master'

Conflicts:
	bin/git-update.sh

diff --cc bin/git-update.sh
index 3fea2d6a7bf0c0fbefadf435d33da300957d4797,e9c0abad5b79e4e983d862b58e0fdd29b493f7e2..de71bec0dc304c78b3041bd13ae85228642f05a1
--- 1/bin/git-update.sh
--- 2/bin/git-update.sh
+++ b/bin/git-update.sh
@@@ -21,14 -13,13 +21,15 @@@ if [ x$1 != x ]; the
      cd "$1"
  fi
  
 -# Get all remote changes.
 -git remote update 2>&1 | grep -v Fetching
 -# Push all local changes to remote(s).
 -for remote in `git remote`; do
 -    git push $remote 2>&1 | grep -v 'Everything up-to-date'
 -    git push --tags $remote 2>&1 | grep -v 'Everything up-to-date'
 -done
 +if [ x$LOCAL = x ]; then
 +    # Get all remote changes.
 +    git remote update 2>&1 | grep -v Fetching
 +    # Push all local changes to remote(s).
 +    for remote in `git remote`; do
 +        git push $remote 2>&1 | grep -v 'Everything up-to-date'
++        git push --tags $remote 2>&1 | grep -v 'Everything up-to-date'
 +    done
 +fi
  # Show unmerged changes.
  git branch -rv --color --no-merged
  # Show uncommitted changes.