Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 14 16:26:40 PDT 2014