Sync'd branch releases/release with upstream @ Tue Oct 21 13:19:19 PDT 2014