Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 30 11:38:41 PDT 2014