Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 21 13:25:48 PDT 2014