Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 21 19:02:08 PDT 2014