Sync'd branch releases/aurora with upstream @ Mon Sep 15 09:32:34 PDT 2014