Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 15 08:08:38 PDT 2014