Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 30 19:06:42 PDT 2014