Sync'd branch releases/aurora with upstream @ Mon Sep 29 11:47:37 PDT 2014