Sync'd branch releases/aurora with upstream @ Fri Sep 26 11:22:34 PDT 2014